<<<<<<< HEAD
<template>
  <div class="about">
    <h1>This is an about page</h1>
  </div>
</template>
<<<<<<< HEAD
  <div class="home">
    <HomeNavbar></HomeNavbar>
    <HomeTabbar></HomeTabbar>
    <div style="padding-bottom: 15%"></div>
  </div>
</template>

<script>
// @ is an alias to /src
import HomeTabbar from "@/components/home/HomeTabbar.vue";
import HomeNavbar from "@/components/home/HomeNavbar.vue";

export default {
  name: "AboutView",
=======
=======
<template>
  <div class="home">    
    <HomeNavbar></HomeNavbar>
    <HomeTabbar></HomeTabbar>
    <div style="padding-bottom: 15%;"></div>
  </div>
</template>
<<<<<<< HEAD

<script>
// @ is an alias to /src
import HomeTabbar from '@/components/home/HomeTabbar.vue'
import HomeNavbar from '@/components/home/HomeNavbar.vue'

export default {
  name: 'AboutView',
>>>>>>> upstream/master
  components: {
    HomeTabbar,
    HomeNavbar,
  },
<<<<<<< HEAD
};
</script>
=======
}
</script>

=======
>>>>>>> upstream/master
>>>>>>> upstream/master
>>>>>>> upstream/master
